Refactor create_alert task #3759
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
iskhakov
force-pushed
the
iskhakov/refactor-alert-creation
branch
from
0235c6e to
64fe5e1
Compare
iskhakov
commented
Jan 26, 2024
engine/apps/alerts/models/alert.py
Outdated
Comment on lines
139
to
140
| if group_created: | ||
| alert_group_escalation_snapshot_built.send(sender=cls.__class__, alert_group=alert.group) |
There was a problem hiding this comment.
There was a problem hiding this comment.
Snapshot generation will happen synchronously in this task (previously it was done in distribute_alert)
TODO: check if it is not too heavy
iskhakov
commented
Jan 26, 2024
Comment on lines
+135
to
+137
| if group_created or alert.group.pause_escalation: | ||
| # Build escalation snapshot if needed and start escalation | ||
| alert.group.start_escalation_if_needed(countdown=TASK_DELAY_SECONDS) |
There was a problem hiding this comment.
Start escalation here
(instead of checking if it is the first alert in distribute alert task https://github.com/grafana/oncall/pull/3759/files#diff-e0f70dd85cf6da1d72318bfb28759b3ebf069a28c16717ac233bf760df488a55R31)
iskhakov
commented
Jan 26, 2024
| else: | ||
| transaction.on_commit( | ||
| partial(tasks.distribute_alert.apply_async, (alert.pk,), countdown=TASK_DELAY_SECONDS) | ||
| ) |
There was a problem hiding this comment.
We don't need this task anymore
TODO: don't forget to change alerts and dashboards
iskhakov
commented
Jan 26, 2024
| if not group.acknowledged and mark_as_acknowledged: | ||
| group.acknowledge_by_source() | ||
|
|
||
| # Create alert |
There was a problem hiding this comment.
Moved alert creation and group creation together
TODO: consider adding transaction
mderynck
approved these changes
Jan 30, 2024
iskhakov
added
the
pr:no public docs
iskhakov
added a commit
that referenced
this pull request
Feb 20, 2024
# What this PR does This PR simplifies alert group/alert creation, so the alert created and escalation started in the same task. ## Which issue(s) this PR fixes ## Checklist - [ ] Unit, integration, and e2e (if applicable) tests updated - [ ] Documentation added (or `pr:no public docs` PR label added if not required) - [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does
This PR simplifies alert group/alert creation, so the alert created and escalation started in the same task.
Which issue(s) this PR fixes
Checklist
pr:no public docsPR label added if not required)CHANGELOG.mdupdated (orpr:no changelogPR label added if not required)